bitkeeper revision 1.1159.1.390 (418ea00dKzy4t1zq4CRkHKJwX2Ruxw)
authorkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Sun, 7 Nov 2004 22:22:05 +0000 (22:22 +0000)
committerkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Sun, 7 Nov 2004 22:22:05 +0000 (22:22 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk


Trivial merge